From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 May 2010 15:16:34 +0000 (-0700)
Subject: Merge git://git.infradead.org/battery-2.6
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~18068
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=4961ab934a1254b1ad9420cea0ded617b57f022b;p=linux-4.9.git

Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  power_supply: Fix regression for 'type' property
---

4961ab934a1254b1ad9420cea0ded617b57f022b